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

Change-Id: Ic393c2f71f4f0d5fe201936acaeded3be9c741d5