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

Change-Id: Id8510d877f82da38a8b71aeb0e0cef1020e242bf