update for 4.2.3 rc1

and force-fix errors using pocheck

Change-Id: Ib0aa51688cb2bc9586f79d9ef32c99848bcdec2d