Patch 3.4.97 > 3.4.98

Change-Id: Icee9442239c7453676c21d5aed0282a0f45f99c7