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

Merged-In: If64fd90fcb81cd89e4ebf661ff18415d6c726bc0
Change-Id: I7f1aeacfc6dac456499c0f40748bd9fae817c2b6