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