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

Change-Id: If4cd6d9504c519c186e1f3a1913ed91e81a3ae6b