Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev am: 2f1ca945b1 am: 1b1e6d3ec9 am: 8ec4061310 am: 40d1b833d8
am: 73763b165e

Change-Id: Ia96b46ff5c254047eeff4dad62a0429a6d75ddf9