Fix review comments on aosp/1213524

This is necessary to avoid subsequent conflicts.

Test: none needed
Change-Id: I6e2cd9188e0e4bd7c71c6c56635f192dce73f325
Merged-In: I621cfbe165996c67b201ca2dd2f95a5ab9af10ee
1 file changed
tree: dc117325f65f1b2e6982b003e81f448e510e7e05
  1. core/
  2. services/
  3. tests/