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

Merged-In: I2f184a8c43c83c1946b8096fd59d5e04988f5100
Change-Id: I15deab71a69e61aee82bc04d4433c663ee56358f