[automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 75fddad9b4 am: 07b69e4658 -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 1f9e9ce3d5 is in history
Change-Id: I5ad62604060d15c2e802f612eaea80cd75040ff8
This commit is contained in: