and force-fix errors using pocheck Change-Id: I64fe815a46b844bc1c9e53327d7e9367f0f589ec
and force-fix errors using pocheck Change-Id: I7557b97bdb5a55b6fe5b9566c90bf8fb6ddd6468