Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I115103a3400648975f1ec13f1616cc05ef205679
Change-Id: I853d3172cf4703b56bfce403d5018c403b38abef