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

Change-Id: If9f97adf518a824ab53a7fa0fcbe2b2001ba9fbd