Import translations. DO NOT MERGE am: 2dceb0fe40  -s ours
am: 2b41d966ab  -s ours

Change-Id: Iad12294f12e89c6e8dcaf7ddcb88226930e2dd5b