Merge "Import translations. DO NOT MERGE" into oc-dev am: 995627c3 -s ours am: 899f5cf3 -s ours am: 79ef7d95 -s ours Change-Id: If943b496bc5845af3aecb339b80f4c63ee62d32f