Merge "services/mgmt/device/impl:  wait for suidhelper to exit"