Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 6300674d27  -s ours

Change-Id: I242fc96c03e5e4754cbc3fee027ce483301f0b1c