Merge "Rename legacy permission state."