Merge "Import translations. DO NOT MERGE" into oc-dev am: 5acdc8c3d5  -s ours
am: bcd06fab1d  -s ours

Change-Id: If192805c88157baf69e8be9c55009145648b5e63