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

Change-Id: I44c91d899d1718557316d1f9bec1d87613d47fbd