Merge changes Iec53a9fd,Iac4cfe70
am: ab07d23ac3

Change-Id: I8fae2c4d23d6e904b473b1e906094f997c8e446c
tree: f4f09bbad1fd5f6df57ef1fd64c4cff35b9706d5
  1. core/
  2. services/
  3. tests/