[automerger skipped] Merge "Fix typo in aosp/1242602" into rvc-dev am:...
[automerger skipped] Merge "Fix typo in aosp/1242602" into rvc-dev am: 984a51c6 am: eb956a30 -s ours
am skip reason: Change-Id Ie023c8371785fc239c54eacbf056141c2e9e3444 with SHA-1 42f2754b is in history
Change-Id: Ic360dcd155ac43a7131db8a8bcfbfb1d0cbfae5e