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

Merged-In: I374549da83a882c826b204ff0a1d9a8df6c7e271
Change-Id: Ieee7086009e2bf23965bc47044b82c98ff170ade