4.2.2_r1 round2

Change-Id: Id7e1e032a5af564204f512b686da59ed1316d636