Merge changes Iaa6f0d65,I68a16b64 am: 757efa5551 am: f3ac65de98

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