Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: Ic837938ff279e3d4654be39c1f3f13c77c274dc1
Change-Id: I11233280680189688195c81c73d60680d6d19c44