Merge changes Ibc9b1965,I288ea32f am: 7fa63afe6d am: 5177c42147

Change-Id: Ie9e18056da529defae5c5a0065607cd972d30b80
tree: da1025fbd558fe2fa249a5cc54de3b9d0d89df6d
  1. core/
  2. services/
  3. tests/