update for 4.2.2 rc1

and force-fix errors using pocheck

Change-Id: I39794b3eccd500bb1dc4a0944492924308b066c4