Import translations. DO NOT MERGE
am: 05a48e2a3d  -s ours

Change-Id: I952a728c521909efc873b2050ffd98afc5fc4103