Merge "RESTRICT AUTOMERGE Empty commit in qpr-dev to avoid merging the change from udc-dev" into udc-qpr-dev