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

Change-Id: I5331ee04e4cd08a2280e07c06f973329a3c41ab4