Merge "Correct Factory Reset activity protect permission" into udc-qpr-dev