Merge "Address nit from aosp/1301317" am: 1894a79964 am: 2dc15b02b2

Change-Id: I7ae9b80954309b18eb6923da3aeaab3d1b8e3231
tree: 3147dd18287906af4060a71783a1ddbf06666607
  1. core/
  2. services/
  3. tests/