Merge "Eliminate reflective form factor aware initialization" into udc-qpr-dev