Import translations. DO NOT MERGE am: 9230fa74ff  -s ours
am: e7ff9a8ddf  -s ours

Change-Id: I09e8e6fd357ffcee89b555e4c09092734fe05721