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

Merged-In: Iafec0500e7c2be4084cd43f39067500ed2500572
Change-Id: Ieb60a53704748982fbc07e1618aaffe365e307ea