Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I0631b58f00dc0c39222e538a31e570206cf546f3
Change-Id: Ib98711b240a5856a3c902e9ef3a25eadfd9ae749