Merge "Address nit from aosp/1301317" into rvc-dev am: 75fddad9b4

Change-Id: I719006d1f3452a51303999dad5805ae0271ffddf
tree: 996dbee3fd7bbec7899bfbddd4826338ae715390
  1. core/
  2. services/
  3. tests/