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

Change-Id: Id188e8eb53b6b3e9d0c468b550fc5ae4ad602289