Import translations. DO NOT MERGE am: 717de1098c  -s ours
am: d171aaeb20  -s ours

Change-Id: I53ac1c76c56e3cd32bdb2814c439975cd9368a1f