Merge "Fix BP implicit flow failure" into udc-qpr-dev