(based on the 4.3 translations) and force-fix errors using pocheck Change-Id: I64547fd1d137a0bfa7bd4a55e8a547a7845faf96
Change-Id: I5dafc5dcce605da8d6831a775ff1d416180b22d0
Change-Id: Ia93f31dedcdff3e180c36473e0667022795d96a7