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

Merged-In: I6d60fae145fa1836997f6f1bffa945b22e439496
Change-Id: I82ab17b2abbd7ae098959c2dab0e4887643e3694