Merge "Add flag for pip2 implementation" into udc-qpr-dev