Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: ccaf50b6a7  -s ours
am: 931bc5accc  -s ours

Change-Id: Ib1dd44878ae38b011d28e23a7503b1621ef88a7f