Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9b3c919d03  -s ours
am: 6a6fc2d68d  -s ours

Change-Id: I98eb29006dfbcb817269b2dbf50a33923a118328