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

Merged-In: I929cfc3549e4b5790a15b08f5a618d03f9987ae3
Change-Id: I75d5c59ab5b00712256be70a9b642bb912da9850