Import translations. DO NOT MERGE am: 2c8f1b6462  -s ours
am: 6f9ac302fd  -s ours

Change-Id: Idbbbde6db0c2415ce7895aa5d35ff7bb6166dfa6