Import translations. DO NOT MERGE am: b0d5c3ef71  -s ours
am: 1de15fa587  -s ours

Change-Id: Iafd2ca284b37da3bc9c88bbe9f28f9b5ce979fab