Import translations. DO NOT MERGE am: 96b4f51725  -s ours
am: 43fa8f469f  -s ours

Change-Id: I1e6767fde98f53ed607fe976339d95c082e0c3dd