Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"