[automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am:...
[automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 4f94389c am: 3677549c am: 4401e112 -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 1f6f7241 is in history
Change-Id: Iea04465f5b85e642324222d9e2fa8152a9f213ba