Merge "Fix test breakage caused by adding new capability by default"