Merge "Address leftover comments on 923337 and 930217." am: b5db40605c am: 5d94f74e87
am: 426f2771e0

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