Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89 am: 74bd3daaac am: b3bc234dfa
am: f05a01caf3

Change-Id: I817598283a95460cebd6890ddcc44950d630d7c0