Merge "Import translations. DO NOT MERGE" into oc-dev am: 8748505b32  -s ours
am: feb24b20d0  -s ours

Change-Id: I05a74ab6c25c17862c5b533b74682dd09ebae4b3