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

Merged-In: I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f
Change-Id: I8bce5f15127d0ea06a2a1efe53aa6f2b16444125