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

Change-Id: I88d6b29f9feddebbbef4b59302bcc06b9df176a4