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

Change-Id: I2306f269edb62724a2c087e3f9509e5c938942fb