Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours am: bd429f42cb -s ours
am: 8c88b53dda -s ours
Change-Id: If72aa100f75f5b39945a0d33402dc74b09b88c07
This commit is contained in: