Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: Ia19e8e3a1921ee2609792db50d43b64a12a21f3d
Change-Id: I8993da68def561557becbac898d6d937718e6ef5