Merge changes Ie762ce75,I611fd791 am: 21a57f263f am: cc9f695ba0
am: 164854bde2

Change-Id: I1495249f1ced84438dbd5dd0ad6678e2ee4062cb
tree: 470c5ebcbb15faba2e48b5737436588f42f1e801
  1. core/
  2. services/
  3. tests/