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

Change-Id: Iff7a04f70b50dc115939f9bc49cd075f3e86bed6