Import translations. DO NOT MERGE am: a11c4b93ec  -s ours
am: dc21bbfcb0  -s ours

Change-Id: I872fcce4a16b560f1b722624fe2553a10ef16fe1