Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I14e0e50b35f05889da56a5ffa35907c744debd26
Change-Id: I1eaa0729209b7d3f1720d6e3236744b3266dd8a5