Merge changes Ic28c5653,Ic635f97b am: 0ca21cfdfe am: a0402e1baa
am: a9b555cfa1

Change-Id: Ieea9917b3a68e08686c74ebf39e5fed61f641a7a
tree: de25b9202a56b7f622e4dafa37d4c06bb819c78f
  1. core/
  2. services/
  3. tests/