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

Change-Id: Ia5bc4c74b28652484b3de90c14807fa9dc1b6bdb