Import translations. DO NOT MERGE am: a6d9842695  -s ours
am: c027907edc  -s ours

Change-Id: I09c421885fb40a57e309a083413797bac5de053b