Merge changes Ibff278a6,If6d537a3
am: 5cb924da73

Change-Id: If1d215b0fae85bfeeb5b6190abf4e4dc841912e5
tree: 475f41c06998ced7722645620b948a6fb1435488
  1. core/
  2. services/
  3. tests/