Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev am:...
Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev am: 2f1ca945 am: 1b1e6d3e am: 8ec40613
am: 40d1b833
Change-Id: Id2268e35f95084f7c742587166c84404b979ac7a