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

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