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

Merged-In: I3d900f29ab1bd0cddcebb1c1561151efe2bbcd3a
Change-Id: I32dd4e8e7378d5e7a2201cce7caf410ff7f9005e