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

Merged-In: I880dfdaeefbb281dfc7494d4a2fc655f50160b01
Change-Id: Ie5a15f909d681ebf2bda18cdbefb7b267d0accbf