Merge "DO NOT MERGE Decoder: Fixed error handling for dangling fields" into security-aosp-mnc-mr1-release