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

Change-Id: I369bf5d92a3f70e789043d33bcbc85099aebbb69
tree: c0e3a40f60f611ed5729dd8580ae8bdbf98af5d7
  1. core/
  2. services/
  3. tests/