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

Change-Id: I0a52d4ad04ee589d80dd34f218eba693097aa979