Import translations. DO NOT MERGE am: cbc4580be5  -s ours
am: 4d28289652  -s ours

Change-Id: Ice8baf9638a4546b53a7cdcef6fd79749c453b20