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