Merge changes I904d87c0,I9ef468a1 am: 85768e2dc3 am: f414222461 am: 30b76d89d1

Change-Id: Ibbe33fae9f12785abd62b24711e07c4030c949da
tree: 8aba18efefc44cdbb2a26fec9f16b66798ee1493
  1. core/
  2. services/
  3. tests/