and force-fix errors using pocheck Change-Id: I5a86a2cfa383bbd34bd95ea0008959518a230793
and force-fix errors using pocheck Change-Id: I2afa63a275311dcc62c8283490ec4ad949006c0c