force-fixed using pocheck Change-Id: I9e116bae500ed37d06b66397f2d815fb2e5dd22b
and force-fix errors using pocheck Change-Id: Idd8a43ec96b75f779aab472e67c1471299160b87