Import translations. DO NOT MERGE am: b4960d2ce6  -s ours
am: 4881f571d3  -s ours

Change-Id: Ie5112b8f27eac539685dc37f337454f558500dd0