Merge changes Ifd7d73ad,Id79096fa
am: abf2a3f652

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