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

Change-Id: I7f70fb1107f47fc30c1de0e8818a2cb318fdbf9b