Merge changes Ifd7d73ad,Id79096fa am: 870c276755
am: f20a1f54b7

Change-Id: Ibce24e5d55e728a1a08f534fa91b3be0bbc3b990
tree: db57cf99f030186b80c9b6328204b86909c06235
  1. core/
  2. services/
  3. tests/