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

Change-Id: I63a334e79ffeff50a02e1a428cfa8b9c6ceae4fa