Merge "Add awickham to OWNERS file" into udc-qpr-dev