more 4.2.2 stuff

Change-Id: Ia7465ba95c9c189942e26b6cc2559ad9b5c9b021