Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 0571e6896a  -s ours
am: d078779956  -s ours

Change-Id: I50e809e902135a72655c8ed668035372c932713b