Import translations. DO NOT MERGE am: 3025a229ba  -s ours
am: 52aaa5c2f4  -s ours

Change-Id: Iefe17ee238c1c0a9b3a3ff7646be0bb94cb21905