Import translations. DO NOT MERGE am: 07edcb65d1  -s ours
am: 2da4c336ec  -s ours

Change-Id: I213a5bba5f2b879e46259d5516ad83457e2c2503