and force-fix errors using pocheck Change-Id: Idd8a43ec96b75f779aab472e67c1471299160b87
and force-fix errors using pocheck Change-Id: Id45e0dc7161738ebd69ba07108b9fdd149643703