Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 56b37be1c9  -s ours
am: 375ee4625d  -s ours

Change-Id: I0001c99a227cc265a69ddd34b26f06d87cc5960c