Merge changes I66e40b4b,I599a2ff9,I7c210623
am: e70b760e83

Change-Id: Iba4bb6d1676d889f1e4a781a7970f01c0e321275
tree: e2717f299fd64e6c71b0484b1934e4263504e969
  1. core/
  2. services/
  3. tests/