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

Change-Id: I515e92a539513b308fc79ae7127d074819bc3a73