[automerger skipped] Merge "Fix the potential BufferUnderflowException when...
[automerger skipped] Merge "Fix the potential BufferUnderflowException when parsing ByteBuffer." into rvc-dev am: 2bd9ba89 -s ours
am skip reason: Change-Id Ibec0991c1f7158f503f8808bf34d9049984099e0 with SHA-1 ffc469e1 is in history
Change-Id: Ide14fa910a35ba9fa0ae461ee7b0a85f0443969f