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

Change-Id: Idc00a34295cdcbefa19636643bff3c3bf2323446