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

Change-Id: Ib4197d83ce8733ae25f2a091d9622dc47205817f