Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 82f6b2d105  -s ours
am: 0eb4382f34  -s ours

Change-Id: Ia6988c7363abd01a4bd289074640e22f0759a6d5