Revert "Merge "Re-enable lazy translation""

Revert enabling lazy translation, which doesn't work in many places
because we're doing string concatenation.

This reverts commit 1864efa320aadbb4f5503c15345dd363bb3691c1, reversing
changes made to 92e3e3ce74dc1e3f75d51600072227c2e44016a6.

Closes-Bug: #1281644
Change-Id: Iac0be685f8bb60f81715c0dd3dbe35787e38ee39
Merge "Revert "Merge "Re-enable lazy translation"""