and force-fix errors using pocheck Change-Id: I20e94552ba33d500d4c949a919dd3f1648d70715
and force-fix errors using pocheck Change-Id: I42420023bbf647224c6e216da57904cedb6b7e89