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

Change-Id: I4481d8b44aa5b37e131cffb813b4aebf9a77b681