fixed 4.2.2 branch

Change-Id: I0cbcace45a45e4c1e923a1ab75fd43af9fc8fd78