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

Change-Id: I4c1239ade7c3d827cbf6f209ef0375ab5420a9e1