Merge "Import translations. DO NOT MERGE" into oc-dev am: c0c868e359  -s ours
am: 24ffb717a0  -s ours

Change-Id: I73c7832b07a9a5595d7b53bff3c2b251a40d7c24