Merge "Update OWNERS file" into tm-qpr-dev