Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I3f019cb8929871dfed63f6cae915bccdfa7928f3
Change-Id: I0da42453a35bf5555c86c0c4ac5a65ae3de9980c