Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: Id04ea331831e8b26ba99478848392b40a92548d5
Change-Id: I888da0c9475f2d00602d917d2f58169f8d7c93a4
tree: 07d68f1c79e87a583c7a50d74898ed0adcdd9106
  1. core/
  2. services/
  3. tests/