Merge "Address nit from aosp/1301317"
tree: d0429e70bc3bf5b5937e2dc9d247b216a20dc330
  1. core/
  2. services/
  3. tests/