Merge "[automerger skipped] Merge "Fix typo in aosp/1242602" into rvc-dev am:...

Merge "[automerger skipped] Merge "Fix typo in aosp/1242602" into rvc-dev am: 984a51c6 am: eb956a30 -s ours" into rvc-d1-dev-plus-aosp am: 6a173ea9 -s ours

am skip reason: Change-Id Ie023c8371785fc239c54eacbf056141c2e9e3444 with SHA-1 42f2754b is in history

Change-Id: Ib41d2d70807d8febcb18c2c83ec2d5f2eacda7a6