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

Change-Id: I10e8b09c9bd167db5f27e6f2739ab417149779ef