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

Merged-In: I451c2ec603e6d3a00228726c894056a2be78dcf3
Change-Id: Ifec8175918103a37d8d16894ae9da32fe3aafcad