Update to 3.4.96

Change-Id: Ib1959e63edd9aa21adb1cef6301dbe85c8a775ab