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

Change-Id: I1a00ce8149f6dfcb40763ee1dad1a6bef4ce15e7