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

Change-Id: Ia20bdf8bfd81198c2edf55c4da45ca226acbbeaa