3.98

Change-Id: I6c98ff581b1d13c75fc168355cb3683b9450bce0
(cherry picked from commit 3a951b29ca1035e303c6c49fd279851aa39b2c2f)