Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I91b84c489668ae1cac5a8143a9350e3ab625afdb
Change-Id: Id39b07cab134b03e42729cd0a7ca91990468d63e