Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 2f317914e9  -s ours
am: 76ae5a498d  -s ours

Change-Id: Id725fee37475264706edcc87655646517c10ddb5