Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 7507f50803  -s ours
am: e44ca45b67  -s ours

Change-Id: If368980134a29609276d4820b86f8f58ad4c29ca