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

Change-Id: Ib32b6e81aaa755736ea9ac810b6349c6a750ac3a