Patch 3.4.98 > 3.4.99

Change-Id: I39db698027f896714cc1093aab3a30c2af3f9c94