Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I5ae7ac4099e100525ddfbbc93de0936340640b8f
Change-Id: I294447e46a517444c610fe6bcb304bf4c6b97188