Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5  -s ours
am: 1018a5d4a1  -s ours

Change-Id: I7edb906e7c2e0e76cb4a523d3e70418c57fc14bd