Import translations. DO NOT MERGE am: ef89f62670  -s ours
am: ec82e05e7b  -s ours

Change-Id: If44cec4ffff23361b3b8b68f7a919ac67f643fcc