update for 4.2.3 rc2

and force-fix errors using pocheck

Change-Id: I2235cc9258d135ba5a72e8599c6fc00ea6e72e13