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

Change-Id: I1d35b06b119081d46680035c32858572a8acad35