Merge "Revert "Enable QS_PIPELINE_NEW_HOST for Droidfood"" into udc-qpr-dev