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

Change-Id: I588474eb1a4e5d96fa9a104603c7f172bdba6100