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: 7b6380a1 -s ours am: f4871ef9 -s ours am: 849f43ac -s ours am: 8c1cab3b -s ours" into sc-v2-dev-plus-aosp