Import translations. DO NOT MERGE am: facc57619c  -s ours am: d045d85bdd  -s ours
am: ab68c1f11c  -s ours

Change-Id: Iac2d6b849a3524f5404ae90a35f563b227b97748