and force-fix errors using pocheck Change-Id: Ic842792d6ee5fe0fc5d1b41808671f8c3ae34dc6
Change-Id: I5dafc5dcce605da8d6831a775ff1d416180b22d0