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