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

Change-Id: Ifb8aae76ed66234e0e39d538d84e2567f9e26003