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

Change-Id: I6596fae1946bffade125a14b3bd095eda557a7a5
tree: 1536726046bcb84c9d71df737b3bc5c696927ee6
  1. core/
  2. services/
  3. tests/