Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4498012c8b  -s ours
am: acc482472c  -s ours

Change-Id: I425ba41ae996e418d280326c58a2d1e87f5a615d