Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I6c0f824771a2df59f8aeb3bd59e857a53d0386bb
Change-Id: Ib212b2d26e7e0a204b64045fce972af77e366623