Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I439dcaaa34979adff8ca260774e9b72833b5f291
Change-Id: I1ea6bc818dd01d60cd2fd47d740887b018841ed8