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

Merged-In: Ib6ee2549cbe7a043dc961f50cfab666bf0174ae5
Change-Id: Ieb4b5e192c9215a5a81cde56732f22bee9fbd2e6