Merge changes Ia43f8811,I7de4f672
am: 3ef04b8e3c

Change-Id: Ifcacd81d343a29b17fdb79f4c8b54c89a293a2b8
tree: 215fe0acaf8284b3d50f1d47efaa6cdd868aa9dd
  1. core/
  2. services/
  3. tests/