initial 4.2 bringup

Change-Id: Ie8963d5ccb1d60510cc8d92f025e6b017e26cc29