Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 2ec3964ba4  -s ours
am: 2e38bfc0e1  -s ours

Change-Id: I05e794e227ceebbfcabce7201635fe970b57d5e5