and force-fix errors using pocheck Change-Id: I24f01a149404b4ed23b7800e680e5f9d1798345c
and force-fix errors using pocheck Change-Id: I9b084737aef30bc65308a263b5fdcd68316197ba