am 8d3807ed: am 92ea2c90: (-s ours) Merge "Revert "DO NOT MERGE: Move translation entry point into translate.c."" into klp-dev

* commit '8d3807ed48bcaf14232b06820e2eca741608de70':
  Revert "DO NOT MERGE: Move translation entry point into translate.c."