Merge changes from topic "fix_master_build"
am: 2e5319117a

Change-Id: If49999e7ce6149e847a678b03ccf8b4549f8365b
tree: e277b028a29791cc84d73f41fdab09c065634691
  1. core/
  2. services/
  3. tests/