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

Change-Id: Ice521e238b961521fd240f13a9481c551fe4e6f2