Import translations. DO NOT MERGE
am: 9a2f574fce  -s ours

Change-Id: I272624435bf8a0bb07be7eb883f85f073623d85f