Import translations. DO NOT MERGE am: 46d3cd00fa  -s ours
am: 001d41e069  -s ours

Change-Id: Ib280f28516b3bc0f992e969bb1999934e63f306f