Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I52d6cae7d8a17ba9db10eceb8521c1232c09b992
Change-Id: Ifaa2efb207ed73d75e6687ddbaffeca23563f5aa