Import translations. DO NOT MERGE am: a6a28406e1  -s ours
am: 98a57d27e2  -s ours

Change-Id: I02615f2a8e621f50c2ab3dc6e74b6353551e0f38