Import translations. DO NOT MERGE am: 72f0818d43  -s ours
am: ad72f1b121  -s ours

Change-Id: I3be18ffce61dbc4068f4937c25fe6b6b589632fd