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

Change-Id: I1511d72e48f1f360663933da8847694de558d3fe