Merge changes Ie756b9aa,I38110f3a am: 810e743c54
am: 42ba28f18f

Change-Id: I8695507cb084a198308b5765bc8fb873ca3f6a30
tree: 7cd6c3cd04b8d13039b19d236add6a4820c5a3db
  1. core/
  2. services/
  3. tests/