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

Change-Id: Iaef9cda71205d4e67ab5311b509090278501a773