Merge changes I7ea39b80,I6b9979f3
am: 310d1dac0d

Change-Id: I33b163077fcc270f79a11a43e481767934e8ac9e
tree: 4f22242feb646503ba0a8912e879ff45b850e962
  1. core/
  2. services/
  3. tests/