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

Change-Id: I6bf7ec12c4e7d35322d4e53e8c0b6f60878e7b97