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

Change-Id: I9e082bc72af2033aa0fcb3d565f77cba619f090c