Import translations. DO NOT MERGE am: 327f6730c7  -s ours
am: 71e3e281e2  -s ours

Change-Id: Ie97c056f5f0a26d140cd06aebfc569d3c9b6f86b