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

Change-Id: I01f7085578654d2e2a0a64901f6c759b49db2e89