Import translations. DO NOT MERGE am: d8a0e0d37d  -s ours
am: 10aafe5697  -s ours

Change-Id: I344c7400cfd9567679dba0e9b87d4208c78090ba