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

Change-Id: I315a33420ed9ae8a44a3519661ac9517c36ffa3d