Import translations. DO NOT MERGE am: 2cce48fde4  -s ours
am: 168cbe5d83  -s ours

Change-Id: I7e483fc719cf5e9613e7d6296fa583a206a33299