Import translations. DO NOT MERGE am: d89df3d268  -s ours
am: 79467dd972  -s ours

Change-Id: Ia4b0b0884b46e37160c717f421dfcf24140c8d01