Import translations. DO NOT MERGE am: 6fb3b77745  -s ours
am: 9e7ac87d08  -s ours

Change-Id: Icc870fda386710dc570c0c9846b4eba8cf9d47fb