Merge changes I0baf582f,I4bba01ba am: 6d7c97dc5c am: a0540419f9
am: 7fd6b91b04

Change-Id: I2cc021899270b41e4b9047ef32869af53ea6fb65
tree: ebf200df083ea4fed28bd721b5165debabaf29d6
  1. core/
  2. services/
  3. tests/