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

Change-Id: Iafbfa3a35c305d284ad3a2a2ed06782b80768f7f