Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: ae1e26564b  -s ours
am: 21310fde50  -s ours

Change-Id: I81ecaa6131fb498660843c9fc9f6c78d6a94ae32