Merge changes I6260695b,I88f00ca4 am: db9335b832 am: 637ea71e2c

Change-Id: I8d44be12a15d33db6fec6556bf9494ad60fa4c59
tree: 7fe7a320977776dbc4a55f9a3771c4d8c35b0a34
  1. core/
  2. services/
  3. tests/