Cleanup translation update function

Change-Id: Ib59d8ea337020cb115b4cfafcc47e24d4fe78243
Merge "Cleanup translation update function"