fix 4.2.2

Change-Id: I7ab511ef37f171cd52d2814c78c629feea798cc0