finish 4.2.2

Change-Id: I52d41dc02ab4a15f8d291f9fe994a4646e7270b7