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