Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae  -s ours
am: 4d00a9512a  -s ours

Change-Id: I194fa29eb575b6bdd91a167c6d7826c4fda7df69