Merge changes I3b3bcbbd,I18b3f263,I3c416c1a
am: 3f6d2b08ad

Change-Id: I3bf92d8c1d1b4451b1af9dcb518b352ae40cc7ca
tree: bfb3ec6895544b675d69679ef3f615a678f201a5
  1. core/
  2. services/
  3. tests/