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

Change-Id: I6cf7bbaf20fcf2321a0f2caac220c4fe28a3b132