Import translations. DO NOT MERGE am: ae5a3067f5  -s ours
am: ee7e229e40  -s ours

Change-Id: I5d2d524f333af3076ae435edfb6ea1e2accfa348