With both updates applied, system still boots to emergency mode. I'll try changing from multipathd.service to multipathd.socket.