Import translations. DO NOT MERGE am: ed22521f97  -s ours am: 3403a93d2c  -s ours
am: b9884f1b60  -s ours

Change-Id: Ic21fd67c5612e6af6619cbf3c11d5618a1096d2b