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

Merged-In: I4066da55aa7b3aac606d5bbf9830f7265a82b2ca
Change-Id: I261d5909b521d17e1e34f3dfe01570ccdd40277a