Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I280ae3c2f68a9d42f327fb7fe876630e1d9aedad
Change-Id: I3e7961f35d3222642f7f4a1c181ce48363f43501