Patch to 3.4.90

Change-Id: I1d1564f92f8e75d9c575e8806b5e90d89ca3ef4f