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

Merged-In: Ie6332cbba92131c35adae5a28556560d3a42ee47
Change-Id: Ic4beb5c5ca7e2aa926bcda243e56cc71d5618cab