Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 20f3c4508c  -s ours

Change-Id: Ie8b664833fa4b20844e1fb2b4edd2d8478d399b4