Import translations. DO NOT MERGE am: cb7136a2bc  -s ours
am: c0482fd65e  -s ours

Change-Id: Ica6de9d64fedb5d7d12a99a29e9ff40252e5e335