Merge changes Ic1a5d032,I271e7f4d,I7af37281 am: f1211e9531 am: 089b1c3273 am: 813be534d6

Change-Id: Ic56ae1463dc4229e01f60d2c9afcbb7f6337a97d
tree: 8209d767980f987b23fb09297973604fed7049d5
  1. core/
  2. services/
  3. tests/