Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: d626e07492  -s ours am: dd70db430a  -s ours
am: 935ce8d1b8  -s ours

Change-Id: If272bae040e6afa237df7b63826a671adec93604