[automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 75fddad9b4 -s ours

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

Change-Id: Ifaf50fb9e04b1403cc75d9002e46c6955e111a40
tree: d141adcc3a0473d60ecdc2cb4b4214a6d297c5e8
  1. core/
  2. services/
  3. tests/