Merge "Add content capture/protection units to presubmit" into udc-qpr-dev