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

Change-Id: Idc17fe6f41f47f75ce48a5fc57072c8fc6b26bf6