[automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am:...
[automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 4f94389c -s ours am: 323a1079 -s ours am: 9aae5ad9 -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 cbb1fd0a is in history
Change-Id: If7bac76f0d8a27712113636ffc5f65649e055db9