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

Change-Id: I8acbce3812a268b1505f0db98805da476483aafc