Merge "Allow setup app to have SAW permission" into sc-dev