Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 482b2c3b12  -s ours

Change-Id: I943722c47109b65dee52ad67292b14ec53074a24