Import translations. DO NOT MERGE am: a11c4b93ec  -s ours
am: 03e1bb5794  -s ours

Change-Id: Ia03641f67c228f82ae2b78858a89fc4d3315e6f9