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

Change-Id: Iac2f9bb0d8b117c4882fe052e95120dc85bf8086