Merge "Import translations. DO NOT MERGE" into oc-dev am: df12f01abd  -s ours
am: 146f901c9b  -s ours

Change-Id: I8f49d02b3ae75bbf6a91ce8715041f4368813784