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

Change-Id: Ia5bf5f5b4f2534adf8ea60557494263f1eaef51b