Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 682ff5562c  -s ours
am: 7189b42b4e  -s ours

Change-Id: I75bdc4b95f5f693ac00deecd7a4f729e01b711a9