Merge "Import translations. DO NOT MERGE" into oc-dev am: 2758e3af09  -s ours
am: 748d6e3404  -s ours

Change-Id: I30d9c967e92847e096a29761cb275e3dcd631789