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

Change-Id: Ic283086745e42fe4351c3817782e46ac9c93f1dd