Merge changes Ie756b9aa,I38110f3a
am: 810e743c54

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