Import translations. DO NOT MERGE am: c51dd09193  -s ours
am: 0966a9085d  -s ours

Change-Id: I6affa4a46e570fd94da1bd21b67ebe2dcc01ee40