and force-fix errors using pocheck Change-Id: I6b444d20d156df4126666efaeb30a0902054362b
and force-fix errors using pocheck Change-Id: I8743837d52212af0d16ae1aeddc83651fb5d89d4