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

Merged-In: I539efa4d0551970e0c5c05a91e8385412e7ce9ed
Change-Id: Ic3acc851ac7e878bbeb19fddc0e54136c400f21d