Merge "Add ADPF owner to system_health.cpp" into main