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

Change-Id: Iac7e7529df9031b985b24dea82e4e2fc7735a066