Merge changes I4b793e86,I6f86add0,I2db9535b,I703db6d3 am: a8ebfc4584 am: c437a40578 am: 11790971c8

Change-Id: Ic7da17d474c2d699bd0053547698840b5d87972d
tree: 0f87d149b5ca479646385d5081a7ecfe36e8a9a4
  1. core/
  2. services/
  3. tests/