Merge "Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev am: 2f1ca945 am: 1b1e6d3e am: 8ec40613 am: 40d1b833 am: 73763b16 am: e9ec9486 am: 2411d507 am: 5795e091 am: a55b5dd4 am: 359a2ba8 am: e127b146 am: 21aaa602" into oc-mr1-dev-plus-aosp
