Merge changes Ic28c5653,Ic635f97b
am: 0ca21cfdfe

Change-Id: I38218d8652ec36f2ea076a6806df883a9c9636de
tree: 3aec7e4e36cdc421517357c72456fd85066e5b6c
  1. core/
  2. services/
  3. tests/