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

Change-Id: Idaf923acd47974e468c4793a65535266478467ee