Merge "Support recovering VM on the same host" into stable/brahmaputra