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

Change-Id: I4393ad6185c54c0cf6cd8534e03cbca1d81f5af5