Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I53be84dd3523bbcfff8272718149e3b372af3da5
Change-Id: Iea7d1bc324893a4fd1a27b23388326648ef75e86