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

Change-Id: Iff0d8a4ed10c78fd7edf831d715c386ff2d3aaf3