Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: Ie54e5d06722d866888bf58ae3202a5f4030d4897
Change-Id: Iaf2394081fe5ac966a975ca9b9785fc6021431cd