Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I30a00b2166b014e09dbbe380ac92e94d76438075
Change-Id: Ie8b4caf3591360776fb5ca2774056d5c44a22287