Merge changes I7065d081,Ic7c3a331,Ia432057b am: 6a0bafdb58 am: 14ea3431d0

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