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

Change-Id: I8be17d45e727141f2d6690a2afa02526c9eb50a0