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

Change-Id: Idf537deb9593253c352a3dbcbb4a18ecfdc1e487