Merge changes Ie28e6c80,I3cb9b2ce
am: 706067c79a

Change-Id: I7e910aaed571c3c37fd4a5ba4d5a0eeb5f52c8bd
tree: 205ccdee6bdcaad0ca98093bc0b579eafe5b7149
  1. core/
  2. services/
  3. tests/