Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 677620436a  -s ours
am: 6f48ed11db  -s ours

Change-Id: Ic8bbe6785ba64c0e0cf12ebc8196c528382cb1e1