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