Merge "Making SizeSpecSource platform agnostic" into udc-qpr-dev