Merge "Import translations. DO NOT MERGE" into oc-dev am: d406f38d -s ours am: 08947751 -s ours am: a23e69f2 -s ours Change-Id: I9b4b45c914a37deb96d00ceb4b9068c61d1cae53