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

Change-Id: I11b516cc23ae3714a6c75d937bdb6a24a772c255