Merge "[automerger skipped] Merge "Fix parsing code parcelling errors" into...

Merge "[automerger skipped] Merge "Fix parsing code parcelling errors" into rvc-dev am: 2b220b4e am: ea6f7b25 -s ours am: d3869be1 -s ours am: 8dd09894 -s ours" into sc-qpr1-dev-plus-aosp