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

Change-Id: I92cc5591aa761f7eedfa843c682388d69ffddf7f