Merge changes I7065d081,Ic7c3a331,Ia432057b am: 6a0bafdb58

Change-Id: I1e5d79606f63540f2d9ae3187057e2ba84f4dcb8
tree: 4a34b96bba2a10b9b1a8debdb138033ec669abfb
  1. core/
  2. services/
  3. tests/