Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 8ae8079ed6  -s ours
am: abde450589  -s ours

Change-Id: I943508c074c24299d2416a78acbdc21c6cfddd02