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

Change-Id: Ib215cd0c63c44e547519b9beacc903b05de1ef24