and force-fix errors using pocheck (based on 5-0 templates) Change-Id: Ia5f050e72d6aa24ae5ec73898e7c05ca2d4103cb