Merge "Address nit from aosp/1301317" into rvc-dev
tree: 996dbee3fd7bbec7899bfbddd4826338ae715390
  1. core/
  2. services/
  3. tests/