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

Change-Id: I6c65374a3513af4189577dd3430d57ba34b306f6