Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE

Merged-In: I92ad7146ad926a1c9a76461bf4bda38bfbf6b0c8
Change-Id: I00b57cb1b7ca75ba19667ae947492536cc58628d