Merge "Flip appops corresponding to default-granted permissions"