Import translations. DO NOT MERGE
am: e0e30f5320  -s ours

Change-Id: If1a43ad1feb011755cf61f6c38a37b6c37ce56c8