Merge "Mark some tests as requiring root."