Import translations. DO NOT MERGE am: e8b1aebb88  -s ours
am: 489f0674c8  -s ours

Change-Id: Ic068960e0e7b935b943964d87bebda716ee2a770