Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: Ia41629ffb2acad0754555814dafedc98500996a1
Change-Id: Ia3efd6384dd088428465d9ea2a80928e1f2a0419