Merge changes Iaa6f0d65,I68a16b64 am: 757efa5551

Change-Id: I687e59f2c25d5c5e2cb5b1574dbcf6f32ec8c817
tree: 69035b51e609a590dbfc27ea8682a8ce8666a751
  1. core/
  2. services/
  3. tests/