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

Merged-In: Ia9fb9f3b964850daeba5b0a3bedd3c04c37b6e97
Change-Id: I5c37566af95a45de2a490540947e384b0c648c8f