Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I6618235ba4900ea848a19e8ab274ade484118b79
Change-Id: I987346b184a591d0edd398270334cd4bf3663943