Merge "Add plumbing for ADPF FMQ" into main