Import translations. DO NOT MERGE am: 54d87dc0b9  -s ours
am: bca61746e5  -s ours

Change-Id: Iee9b1f0c82f1587c55ae2270100bf529cf85bdfa