[automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 75fddad9b4 -s ours am: fe2c8cf87c -s ours am: 06449a4bfe -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 436608cf39 is in history
Change-Id: If7bac76f0d8a27712113636ffc5f65649e055db9
This commit is contained in: