[automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 9024f27f97 -s ours am: 4a038d3874 -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 4a7eb2a5d2 is in history
Change-Id: I68df91460ca23d2ec5336543bbedec0b802d80d0
This commit is contained in: