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

Change-Id: I5492d61cc782881e2fe7502bfef358468b75a555