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

Change-Id: I8421a6ad828df9c491665144533931352a6196f1