Merge "Opportunistic cleanup"
am: 493f8c38bf

Change-Id: I5ac4ae5f941e741a88c595ae5f12b804a758abe6
tree: 2cdbbb9843cd28f3a0463b9f582c7dd70860085c
  1. core/
  2. services/
  3. tests/