Patch to 3.4.91

Change-Id: Ic39fe916d5d2ea194a1c2485c57ca9b773a6fd07