Import translations. DO NOT MERGE
am: 1687e9f1f6  -s ours

Change-Id: Ifb82f79fd3ef5ee8dff00d3c421275fd28e8c775