Merge changes I794a24d0,Iab32b2db am: fb8591f9d7

Change-Id: I03f6b9e521793b92f83a21583a2e53fb1d31fba1
tree: ef70749c1daeed5883d40acc432a9db7c0a80e64
  1. core/
  2. services/
  3. tests/