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

Merged-In: I0d1d88bf6aca3324e8348642aa7e77aa663ba806
Change-Id: I4fadc5d63b6b32afd9addf930af287ec91ea9722