Merge "Make permission2 tests account for new permission"