Merge "[automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev...

Merge "[automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 4f94389c am: 3677549c -s ours" into rvc-d1-dev-plus-aosp am: 6d1ff7dc -s ours am: 7a672c0d -s ours

am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 cbb1fd0a is in history

Change-Id: If5618d2d97de0a8257d562265f1254de6c5dabfe