Merge "Address nit from aosp/1301317" am: 14a5bf9510

Change-Id: I2443c5da4b69bce693a39e894c41db5b25b6cf03
tree: d0429e70bc3bf5b5937e2dc9d247b216a20dc330
  1. core/
  2. services/
  3. tests/