Merge changes I904d87c0,I9ef468a1
am: 85768e2dc3

Change-Id: I4edaf325eb0d18d9871bb3cda8005433e2e40132
tree: be343ea05dbcdeff9e3cc4641b8df57059acd483
  1. core/
  2. services/
  3. tests/