Patch to 3.4.87

Change-Id: Iab9c3a40130f3d9588a524218c61c5b6c7877d4f