Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d  -s ours
am: 5679e1cc6e  -s ours

Change-Id: I62d5eaf20549840c1a4adab9f247b292e3505159