Import translations. DO NOT MERGE am: 34e2854786  -s ours am: 93d2e08ef2  -s ours
am: 9fe8b8b663  -s ours

Change-Id: I07911aae8d7c9dbe1383072917ab52d314dfff20