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

Change-Id: Ic023ad60f26ebf1819f6e2a7b40ccf066a84c920