and force-fix errors using pocheck and do some additional cleanup of bogus strings Change-Id: I03e13820a5d71ee70b4e8728475d8409cff9493a
and force-fix errors using pocheck Change-Id: Idd8a43ec96b75f779aab472e67c1471299160b87