Patch to 3.4.89

Change-Id: Ic0c0c6d6116e64e9a185984b358b06a175f76514