Merge "Import translations. DO NOT MERGE" into oc-dev
am: 728c610446  -s ours

Change-Id: I6b15bd645c0d70a710a45e213a95066e93be50b1