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

Change-Id: Ibba586e4df27c31e221cc239e7b4874de8c743b9