Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d  -s ours
am: 041f0dce8a  -s ours

Change-Id: Ic242af69e818aefb95a3b889294fb45240432a33