Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I4cd9725b3049dc96a56a723902470fd89501b9f8
Change-Id: I96f6c85910d542504033029b9042a120fcdc3669