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