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

Change-Id: Idb8339153fe080299dd85c757854d00959fdbdf8