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

Change-Id: I533bd4785a565770f4b678b08aa64c27a9261833