Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9ce641fd81  -s ours
am: 0c411c32cd  -s ours

Change-Id: Icb98d17a57ee254b3a5d3df7b4eee7332e14c35f