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

Change-Id: I38570abe304599739f9e4dd8c450f9ae0b25a7d4