Merge "Address leftover comments on 923337 and 930217." am: a9b8e31cf8 am: bc8ca075ef
am: 6106d1e017

Change-Id: I75eadb66c81d72c768e77feddd383d60f8accd65
tree: 4f5e22b72c9314e94bb0211410c111d2d10323a6
  1. core/
  2. services/
  3. tests/