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

Change-Id: I418c08d5f5bf997d7e870bafc2a0b68f519dd990