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