Merge changes I2ddfef0c,I49bee0c9 am: ba4d5be35a
am: 11c58491ff

Change-Id: I552730badc910df5f5a48c2ded6566071b604783
tree: 94b2377d1a80ca3750cb2a6d2be7f73aff7d47c1
  1. core/
  2. services/
  3. tests/