Import translations. DO NOT MERGE am: 867eb777e5  -s ours
am: a9bfac4c7f  -s ours

Change-Id: I4a77201359fcb92afd2893bd986c579f7947d7de