Merge changes Ic1a5d032,I271e7f4d,I7af37281 am: 775babe0c6 am: f011628969

Change-Id: If59fd7e540dbb2fa49cb10e5193ad3b5e044b39e
tree: 0ddbd816922c543ecfc613e5e9613d880a6c7187
  1. core/
  2. services/
  3. tests/