Merge "RESTRICT AUTOMERGE: BUILDER_EXTRAS_OVERRIDE to false" into udc-qpr-dev