Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c1bea24f38  -s ours
am: 3da6753edf  -s ours

Change-Id: I8070de9470e8b0ff038280697bd93ca211cb5856