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

Change-Id: I03b5cb7fcef47a9cc6bac750ec035493cf868f1c