Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev
am: 2f1ca945b1

Change-Id: I203d518ad9dc60ea41dfdc88c1903b47398246ba