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

Merged-In: I5c0fe4b0b3be7191d42db14195791d8a8bee503c
Change-Id: I630901126dc42830b8c36ffd9c22d0b903826704