Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I508095fa6285ade14dc831dc1ccee2d0486cf76e
Change-Id: I9e5b5b8c5dc850682c2a874b30b92f8d51542bca