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

Merged-In: Ia872db62aa74ae480d48dcdcd53fb21c70918b62
Change-Id: I2f1b8849d36e4fe03b1e3cb836678be31bfaa1fe